TMS-90809: Deprecated API Usage